Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 00:12:59 +0000 (00:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 00:12:59 +0000 (00:12 +0000)
commit47da8c9839b6a165fefa1a55fa453378f7fa9d3c
treeb760224b69e2eb7d4c6fffd300939bd029e46a1b
parenta4ab91f36e8424379dcb3241f07a1338e744df8e
parent233a683a79db3d0e4edf9cdc2118d9da942470e4
Merge from mainline.